bitkeeper revision 1.1389.5.25 (427b4bfb0hm1BJpfIuZivVfQQA7PkQ)

Kill a few dead definitions/declarations.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index 471fa18cb3b4197a5e98a79576fb55108375e706..f20d664c910040a91e3e7e86c958f3d6fdf925e7 100644 (file)
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -637,14 +637,6 @@ void panic(const char *fmt, ...)
     machine_restart(0);
 }
 
-
-void __out_of_line_bug(int line)
-{
-    printk("kernel BUG in header file at line %d\n", line);
-    BUG();
-    for ( ; ; ) ;
-}
-
 /*
  * Local variables:
  * mode: C

diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 719a68202eefae5c23d63dba3d6e349a8e8ddc23..fabe304155e0e0a37c9a4d5c8aadfd86946aa2e9 100644 (file)
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -23,34 +23,6 @@
 #define CONFIG_ACPI 1
 #define CONFIG_ACPI_BOOT 1
 
-//#define CONFIG_PCI 0
-//#define CONFIG_PCI_DIRECT 0
-#if defined(__i386__)
-//#define CONFIG_PCI_BIOS 0
-#endif
-
-#define CONFIG_IDE 1
-#define CONFIG_BLK_DEV_IDE 1
-#define CONFIG_BLK_DEV_IDEDMA 1
-#define CONFIG_BLK_DEV_IDEPCI 1
-#define CONFIG_IDEDISK_MULTI_MODE 1
-#define CONFIG_IDEDISK_STROKE 1
-#define CONFIG_IDEPCI_SHARE_IRQ 1
-#define CONFIG_BLK_DEV_IDEDMA_PCI 1
-#define CONFIG_IDEDMA_PCI_AUTO 1
-#define CONFIG_IDEDMA_AUTO 1
-#define CONFIG_IDEDMA_ONLYDISK 1
-#define CONFIG_BLK_DEV_IDE_MODES 1
-#define CONFIG_BLK_DEV_PIIX 1
-
-#define CONFIG_SCSI 1
-#define CONFIG_SCSI_LOGGING 1
-#define CONFIG_BLK_DEV_SD 1
-#define CONFIG_SD_EXTRA_DEVS 40
-#define CONFIG_SCSI_MULTI_LUN 1
-
-#define CONFIG_XEN_ATTENTION_KEY 1
-
 #define HZ 100
 
 #define OPT_CONSOLE_STR "com1,vga"
@@ -91,8 +63,6 @@
 
 #ifndef __ASSEMBLY__
 extern unsigned long _end; /* standard ELF symbol */
-extern void __out_of_line_bug(int line) __attribute__((noreturn));
-#define out_of_line_bug() __out_of_line_bug(__LINE__)
 #endif /* __ASSEMBLY__ */
 
 #define FORCE_CRASH() __asm__ __volatile__ ( "ud2" )